DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master Bug: 120848293 Change-Id: Ic571d7dd094ea7b4a08e2c86561826ec75fe3150